Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:48 +0000 (12:18 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:48 +0000 (12:18 -0400)
commit7c652bf456ef16bab043c9fc566a536a140c0210
treeb3e9d160290f584d3cddd9fd61a4e381046fb93e
parent65f84e9c7a691f0078f480f28eae2413c2f61eae
parent4dc9b26b7ca8b12745819120969523018cd30ad6
Merge from emacs-23 branch